From 4aa9d0b1143e7947772549ea87c2bc0cbb27c4ff Mon Sep 17 00:00:00 2001 From: "chrisw@osdl.org[kaf24]" Date: Wed, 20 Apr 2005 10:23:38 +0000 Subject: [PATCH] bitkeeper revision 1.1331 (42662daawcgGfsYXrl37riGl22RhdA) [PATCH] [PATCH 1/2] i386 whitespace cleanup in Linux sparse tree Eliminate extraneous whitespace changes in i386 portion of Linux sparse patch. Signed-off-by: Chris Wright --- linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig | 30 +++++++++---------- .../arch/xen/i386/kernel/cpu/common.c | 2 +- .../arch/xen/i386/kernel/head.S | 4 +-- .../arch/xen/i386/kernel/timers/timer_tsc.c | 4 +-- .../arch/xen/i386/mm/fault.c | 8 ++--- .../arch/xen/i386/pci/direct.c | 8 ++--- .../arch/xen/i386/pci/irq.c | 2 +- 7 files changed, 28 insertions(+), 30 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig index fac0ad6ba9..a6416ed5ed 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig @@ -457,22 +457,22 @@ config PREEMPT_BKL # enters thermal throttling. config MICROCODE - tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" + tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" depends on XEN_PRIVILEGED_GUEST - ---help--- - If you say Y here and also to "/dev file system support" in the - 'File systems' section, you will be able to update the microcode on - Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II, - Pentium III, Pentium 4, Xeon etc. You will obviously need the - actual microcode binary data itself which is not shipped with the - Linux kernel. - - For latest news and information on obtaining all the required - ingredients for this driver, check: - . - - To compile this driver as a module, choose M here: the - module will be called microcode. + ---help--- + If you say Y here and also to "/dev file system support" in the + 'File systems' section, you will be able to update the microcode on + Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II, + Pentium III, Pentium 4, Xeon etc. You will obviously need the + actual microcode binary data itself which is not shipped with the + Linux kernel. + + For latest news and information on obtaining all the required + ingredients for this driver, check: + . + + To compile this driver as a module, choose M here: the + module will be called microcode. #config X86_MSR # tristate "/dev/cpu/*/msr - Model-specific register support" diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c index e1414fee8c..3dc5ed10a6 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c @@ -600,7 +600,7 @@ void __init cpu_init (void) * Set up the per-thread TLS descriptor cache: */ memcpy(thread->tls_array, &get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN], - GDT_ENTRY_TLS_ENTRIES * 8); + GDT_ENTRY_TLS_ENTRIES * 8); cpu_gdt_init(&cpu_gdt_descr[cpu]); diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S index 74b14017bf..04afb41017 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S @@ -67,10 +67,10 @@ checkCPUtype: incb ready - xorl %eax,%eax # Clear FS/GS and LDT + xorl %eax,%eax # Clear FS/GS and LDT movl %eax,%fs movl %eax,%gs - cld # gcc2 wants the direction flag cleared at all times + cld # gcc2 wants the direction flag cleared at all times #ifdef CONFIG_SMP movb ready, %cl diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c index 1947e910ef..d3a3e08598 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c @@ -266,7 +266,7 @@ static unsigned long cpu_khz_ref = 0; static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, - void *data) + void *data) { struct cpufreq_freqs *freq = data; @@ -338,7 +338,7 @@ static int init_tsc(char* override) /* (10^6 * 2^32) / cpu_hz = (10^3 * 2^32) / cpu_khz = (2^32 * 1 / (clocks/us)) */ - { + { unsigned long eax=0, edx=1000; __asm__("divl %2" :"=a" (fast_gettimeoffset_quotient), "=d" (edx) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c index 0cac0f30c3..99e2cccc40 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c @@ -229,10 +229,10 @@ fastcall void do_page_fault(struct pt_regs *regs, unsigned long error_code, error_code |= (regs->xcs & 2) << 1; if (regs->eflags & X86_EFLAGS_VM) error_code |= 4; - - if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, - SIGSEGV) == NOTIFY_STOP) - return; + + if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, + SIGSEGV) == NOTIFY_STOP) + return; #if 0 /* It's safe to allow irq's after cr2 has been saved */ if (regs->eflags & (X86_EFLAGS_IF|VM_MASK)) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c index de51b01855..88c6692a9a 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c @@ -71,13 +71,11 @@ struct pci_raw_ops pci_direct_xen = { .write = pci_conf_write, }; - static int __init pci_direct_init(void) { - - printk(KERN_INFO "PCI: Using configuration type Xen\n"); - raw_pci_ops = &pci_direct_xen; - return 0; + printk(KERN_INFO "PCI: Using configuration type Xen\n"); + raw_pci_ops = &pci_direct_xen; + return 0; } arch_initcall(pci_direct_init); diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c index 3a5b7477a3..816d439b2c 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c @@ -93,7 +93,7 @@ void pcibios_penalize_isa_irq(int irq) static int pirq_enable_irq(struct pci_dev *dev) { int err; - u8 pin; + u8 pin; physdev_op_t op; /* Inform Xen that we are going to use this device. */ -- 2.30.2